Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Feb 2010 10:25:57 +0000 (05:25 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Feb 2010 10:25:57 +0000 (05:25 -0500)
commitfa910920b36c3435b8e340c009b274ada53bafbe
treebb2468fe94b5bee94e8a71854300a740dbd5872b
parentbd511484e30769f90c473941b35796bb80cd6d71
parentde448a77c34ad646153ba5d30fcb1e6cf8e5d536
Merge from mainline.
src/dispextern.h
src/term.c